[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 664f9cd0 -s ours am: c4683fb9 -s ours am: 106ee5fb -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iabb87c59b9a7dee5d56c753c50c509ae15de6842