[automerger skipped] Merge "Merge TQ2A.230405.003" am: 33aa9dc6 am:...

[automerger skipped] Merge "Merge TQ2A.230405.003" am: 33aa9dc6 am: f14a8755 am: 84c68895 am: 901994d3 am: 9bb75784 -s ours

am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 c710617a is already in history

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



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