[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: 752a4725 -s ours

am skip reason: Merged-In I96a013b85ec1ae2d9c6b1d06528cf10ae82a18fe with SHA-1 4000819d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2576672



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