Merging from ub-launcher3-rvc-qpr-dev @ build 6770831 am: fa9675a32e

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

Change-Id: I4f0a01aeff214a31f5dec23f1a1aff41e220b758