[automerger skipped] Merge "Merge SQ3A.220605.009" am: eb681f39 am: 9f29cec2 -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: I6d23de13ffe4f6804e446eac8762baeb73930888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>