[automerger skipped] Merge "Updating some comments and variables" into...

[automerger skipped] Merge "Updating some comments and variables" into ub-launcher3-rvc-qpr-dev am: c3c15cc9 -s ours

am skip reason: skipped by user sunnygoyal

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

Change-Id: I232ff44a8333fddb517fd9515c7cca9ac95517fd