Merge "Fix a couple issues with tracking launch cookies" into sc-dev am: 2aec5f2643 am: 6ee92d7041 am: 8c2c1243e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14347288

Change-Id: Id54e1fb33ae3f840de1d66fa36b5991fd34a7b9c