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

am skip reason: subject contains skip directive

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



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