[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: 18d12d29 -s ours am: b2477024 -s ours am: 28834126 -s ours am: 68b84e9c -s ours am: 9213fcd7 -s ours am: 04242dd7 -s ours

am skip reason: subject contains skip directive

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



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