[automerger skipped] DO NOT MERGE - Skip RQ3A.210605.005 am: 61db2e9163 -s ours

am skip reason: Merged-In Ieb6e324232996ec8ad5119fcbf20b81d62678fd2 with SHA-1 6c9431c02e is already in history

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

Change-Id: I2bc27ebb99a2b8a0925b8caea1dad74169ef06d5