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

[automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e93545 -s ours

am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f is already in history

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



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