[automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b -s ours am:...

[automerger skipped] Merge Android U (ab/10368041) am: 6b3d512b -s ours am: f2df0539 -s ours am: 1e710d6d -s ours am: edbeaac7 -s ours

am skip reason: Merged-In I17a6c8a571b4a0b7d943dfd710cde0f18d03da39 with SHA-1 1485ceaf is already in history

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



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