Merge "Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev...

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

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

Change-Id: I82399c441510b6159690dd5617a659cc805c5d0b