[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf87 -s ours am: f2b5cf274c -s ours am: f1b2e36f35 -s ours

am skip reason: subject contains skip directive

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

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