[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 skip reason: Change-Id Iec4d1963e626829b696c2047c5979a684119acf7 with SHA-1 18c06480 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b45cbf704ffd1558b681a4835bc628dcc132894