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

am skip reason: Merged-In Ic8087c6cc899f3b42adac601ed53e1324043e957 with SHA-1 871d3986 is already in history

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



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