Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into...

Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: a66ea486

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



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