Merge "Merge TP1A.221005.003" am: 418e3d42da

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

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