[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: fa888e6202 -s ours am: 6bd2ef9f7f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/15023995

Change-Id: I3c54799e3a8aa10b179fe8625c5f8c3940f221ab