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

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

Change-Id: Ie21e150287c77a759894adaec554e1f504d503a0