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

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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6e7de3bd526b0419f6fc1513bbc040e44982b0d