[automerger skipped] Merge "Merge Android 12L" am: 41790c68 -s ours am:...

[automerger skipped] Merge "Merge Android 12L" am: 41790c68 -s ours am: 4ea5f0e2 -s ours am: 0cf175a2 -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: I9b778e2ccbaf36fc7f4ad2ae72a6ff008396d11a