[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 042554a0 -s ours am: 49efcf78 -s ours am: 517f250e -s ours am: aab60c8d -s ours am: e798f997 -s ours

am skip reason: subject contains skip directive

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



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