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

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

Change-Id: I4fcab280a970a8cbb665ededfcb780f82ef83923