[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: b2155296 -s ours am: 6327f5f9 -s ours am: 784336db -s ours am: 5a3d39d9 -s ours am: a3e81500 -s ours

am skip reason: subject contains skip directive

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



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