Merge "Merge TQ2A.230405.003" am: 33aa9dc6d6 am: f14a8755f7 am: 84c688959d am: 901994d3f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2529224

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