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

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 201f2cf8 -s ours am: 54ec3315 -s ours am: 6b2e6ab2 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id78860e6761ba4c4954c02508f16ae975e1fb161