Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0a1 am: b44fe59a6f

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

Change-Id: I2e113eb04d527eec28625aaa9a4f67f31254c970