[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bbe0c62d -s ours am: 32910d0d -s ours am: e42c779e -s ours am: dd7c5737 -s ours am: cc0f2654 -s ours

am skip reason: subject contains skip directive

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



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