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

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

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