[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4ebe7fb9 am:...

[automerger skipped] Merge "Merge TQ2A.230405.003" am: 4ebe7fb9 am: f9cdad43 -s ours am: 555746ea -s ours

am skip reason: Merged-In Iea66d7782b3365dea827b854783aeddaa5c6699c with SHA-1 c447ecea is already in history

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



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