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

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94d13554a8bd2cbaf7e832a1db398855f03ee9e0