Merge changes from topic "am-f336b1177b094bad956ee6923045e37d" into...

Merge changes from topic "am-f336b1177b094bad956ee6923045e37d" into udc-qpr-dev-plus-aosp am: 7a027090

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



Change-Id: I6cf0ddc66d6ab39e8c6fa66661dba8d0d81998ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>