[automerger skipped] resolve merge conflicts of...

[automerger skipped] resolve merge conflicts of 521278a0 to tm-d1-dev am: 15ef36bc -s ours am: 988e1712 -s ours am: 8f5103a7 -s ours

am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed is already in history

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



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