Merge "Merge TQ2A.230405.003" am: 33aa9dc6 am: f14a8755 am: 84c68895 am:...

Merge "Merge TQ2A.230405.003" am: 33aa9dc6 am: f14a8755 am: 84c68895 am: 901994d3 am: 43b6a2c4

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



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