[automerger skipped] Merge "Merge SQ3A.220605.009" am: eb681f39 am:...

[automerger skipped] Merge "Merge SQ3A.220605.009" am: eb681f39 am: 9f29cec2 -s ours am: 25c8b58d -s ours am: d59a1811 -s ours

am skip reason: Merged-In I080df3547361aef1aa259dd2b3dc9bdb860a0193 with SHA-1 a2e8e229 is already in history

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



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