[automerger skipped] Merge "Merge TP1A.221005.003" am: 2af83663 am:...

[automerger skipped] Merge "Merge TP1A.221005.003" am: 2af83663 am: ec0cf19a -s ours am: b59986a3 -s ours

am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 5e785a2d is already in history

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



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