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

Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 53ed4131

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



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