Merge "Merge TQ2A.230405.003" am: bb016a19a4

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

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