[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf -s ours am: f2b5cf27 -s ours am: f1b2e36f -s ours am: 02c3da84 -s ours am: 869d8563 -s ours

am skip reason: subject contains skip directive

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



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