Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into...

Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into tm-qpr-dev-plus-aosp am: b8e4974c

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



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