Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into...

Merge changes from topic "am-0af370f6b33542b09d673716bbc90c20" into tm-d1-dev-plus-aosp am: 27bdeaee

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



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