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

Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f am: c4146d65 am: 9dce33f8 am: a32b0553

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

Change-Id: I177080181c9d4d21cb2a419dba524470d95f6496