[automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours

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

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

Change-Id: I27a745bdaa46d24d78ae8e50419c987a944cbb3e