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

am skip reason: Change-Id I768a7f6ad34340864cab5296d946536401fb2f1e with SHA-1 44900ea5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fff46ecddbb98da2b585bf6b9e28e66f2fb7772