[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4c -s ours am: ee06524d -s ours

am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb426 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9b33cb519a95d18ba7d64d90db3b10e3a9afe211