[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours

am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

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