Merge changes from topic "am-44edb64d50f3467493dc6c418b2e5553" into...

Merge changes from topic "am-44edb64d50f3467493dc6c418b2e5553" into udc-d1-dev-plus-aosp am: 9f12a840

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



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