[automerger skipped] Merge "Revert "[DO NOT MERGE] iorap: Turn off iorap for R...

[automerger skipped] Merge "Revert "[DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d5516"" into rvc-qpr-dev-plus-aosp am: 9cae0f5c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13369272

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b518938a1dca6ca8225c1b9d86d8d810a368b63