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

am skip reason: Merged-In Icc7b222094618bfa1f112ecfd3f84e80635b9dda with SHA-1 afca9f7acc is already in history

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

Change-Id: Ifff68c88de2cfc3ebbab14de0abb3abf30e634f8