[automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 677cd616 -s ours am: 3464e331 -s ours

am skip reason: Merged-In Id0c4e3c68ee40e5d0d57449b531228b31f2246ac with SHA-1 451ced2f is already in history

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



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