Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev am: 738b1af342 am: f7897465e3 am: 808a7c1920

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

Change-Id: Iaefdee79289abf431376af0f5f78f2f0d3c9db06