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

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

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