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

[automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326a -s ours am: d8e775a5 -s ours am: e655a213 -s ours am: c3d5f88d -s ours

am skip reason: subject contains skip directive

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



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