[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: 4dd23f26 -s ours am: f6ffca6a -s ours am: 9627fac3 -s ours

am skip reason: subject contains skip directive

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



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