[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108 -s ours am: 6df1ae4e -s ours am: 74fc91b3 -s ours am: ee03d017 -s ours am: 582a27ce -s ours

am skip reason: subject contains skip directive

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



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