[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 skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3 is already in history

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



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