[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE" am: e48fa8c1 -s ours

am skip reason: Merged-In Ib0806c0bf18797da3e44dbe4800283430120b49a with SHA-1 c40b06b6 is already in history

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



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