[automerger skipped] DO NOT MERGE: resolve merge conflicts of...

[automerger skipped] DO NOT MERGE: resolve merge conflicts of c17ec818 to rvc-qpr-dev am: dc2b694a -s ours am: 9d153e63 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I509b0b17ff15db95e2a89b7578df24521008d14e