[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: f96f8e8c -s ours am: 203e2471 -s ours

am skip reason: Change-Id Id57384c385a6d0bc931caf1054812a469daa9ed0 with SHA-1 3401909e is in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1521320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3a2382a7b9266bff658085b8a32e310e2556aa1