[automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443
-s ours am: 90645fb925
-s ours am: 6c49c6dbcd
-s ours
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2085885
Change-Id: I20d6a10afd7b33ce095b5d1b847995d64d1a0b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: