[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 223d9273bb -s ours am: ab5332ac88 -s ours

am skip reason: Change-Id I4fa07b3ba54d994e87a5fa67e9f4e5a0d4d4b28c with SHA-1 93c88fecf0 is in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1520839

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I454789fb917ff40602045aef4a6a6bcc2401e291