[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE"...

[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: 2d4a1144 -s ours am: a7be77e7 -s ours

am skip reason: Merged-In I0fd447ddbf810090e19305b2dc8278acd6e0887d with SHA-1 c187a5cd is already in history

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



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