[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 skip reason: skip tag Change-Id I1093e922d7251b9a30bc5b450f1ed924892f5cac with SHA-1 0b14b022 is already in history

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

Change-Id: I0e42cd5dfd875f3fec28d847498a6c10b3893b01