[automerger skipped] Merge SP2A.220505.002 am: fd1b1662 -s ours am:...

[automerger skipped] Merge SP2A.220505.002 am: fd1b1662 -s ours am: 27861e2c -s ours am: 9bdf0826 -s ours am: 74848d30 -s ours

am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 b029b005 is already in history

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



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