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

[automerger skipped] Merge "Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: d7bdf7f3 -s ours

am skip reason: skip tag Change-Id Ib88200880f73ba755692a5d0e0023a674e5f46fd with SHA-1 71b43834 is already in history

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

Change-Id: I54b465b57f0c6b2cbc5f2aa4fb03756cbbc507a0