[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: d42b34cb -s ours am: b5b9be96 -s ours

am skip reason: Change-Id If196679f41cd9a46e51bbe568a194d91e3fddccc with SHA-1 de2db84c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92fa026ea1571d69235f5424a1d25603b707907f