Merge "Merge TQ2A.230405.003" am: bb016a19a4 am: ec09ccdc88

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

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