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

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

Change-Id: I3804f5e443c62db94c1329941278a59b1611092f