Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into...

Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp am: a6aefac0

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



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