Merge "Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f am:...

Merge "Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f am: e0a08760 am: 3e6a5661" into rvc-qpr-dev-plus-aosp am: c882649e

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

Change-Id: I6ce3a2ebf1b892c3c84c9ba24991804a346f48d6