Merge "Merge TQ2A.230405.003" am: 4ebe7fb96d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2528612

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