Merge changes from topic "am-87bc6609ac824e55ab12cde27de16be6" into...

Merge changes from topic "am-87bc6609ac824e55ab12cde27de16be6" into udc-qpr-dev-plus-aosp am: a19ec25c

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



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