Merge changes from topic "am-ba439323ed2d4083919772fbe6e679d6" into...

Merge changes from topic "am-ba439323ed2d4083919772fbe6e679d6" into tm-qpr-dev-plus-aosp am: 5f3c8785

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



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