[automerger skipped] Merge "Merge 10952656" into aosp-main-future am:...

[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 7b262e34 -s ours am: d122c78e -s ours

am skip reason: Merged-In Ib02ae9caef06a46938947806dac8aabb1fa12d94 with SHA-1 8319a775 is already in history

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



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