Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev am: 738b1af3 am: 569793bd am: bd041b06

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

Change-Id: If6de2d6bf6489de7d63a8862e420a520adcad849