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

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

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



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