[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4 -s ours am: ee06524 -s ours am: fb437d5 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51ed09738078268db94c92729d9d448aefe037a1

Author: delphij