[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 305635f765 -s ours

am skip reason: Merged-In I67970314b0af9ada201493a649166e129b87e089 with SHA-1 7c5567ae46 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/15023149

Change-Id: I74e2ef13194c7ca75c86c00a6e7727fb9839c94b