Merge "Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev...

Merge "Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev am: 738b1af3 am: f7897465 am: 0e93463f" into rvc-qpr-dev-plus-aosp am: 8b8e4605

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

Change-Id: I3ab18190cb2ba11715ec4119267118a9c304a08a