[automerger skipped] Merge "Merge TP1A.221005.003" am: 418e3d42 am:...

[automerger skipped] Merge "Merge TP1A.221005.003" am: 418e3d42 am: eae7bbb3 -s ours am: d4d44907 -s ours

am skip reason: Merged-In I363c98c23f84fe570ea9cb1a40128359f5b67c9f with SHA-1 42b64040 is already in history

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



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