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

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: c1118823 -s ours am: 70cb1ee4 -s ours am: 2a993ca1 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1520605

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idecc25ab799fcb47b99edba27ef99f9c463d8e6b