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

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

Change-Id: I802dd49168cc7d6fb243e3ccbdd4bbad1f7fe370