[automerger skipped] Merge Android 12L am: 82155810 -s ours am: 809f9905...

[automerger skipped] Merge Android 12L am: 82155810 -s ours am: 809f9905 -s ours am: d77cc961 -s ours am: df5b4f0b -s ours

am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057d is already in history

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

Change-Id: Ibc71753cdb93a05fa418558f1306d6ad6fc9c382