[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: c1773e70 -s ours

am skip reason: subject contains skip directive

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



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