[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: 35525a56 -s ours am: ee5c8c91 -s ours am: fdcf2eed -s ours am: 4dd803da -s ours am: 3e95b42b -s ours am: 16b15e9e -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150



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