[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: d3905c2fca -s ours am: 29a648b449 -s ours

am skip reason: Change-Id I4271b2006a41a392b6d3204555dbdd335b65b0e5 with SHA-1 9f234c2ece is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/iorap/+/12470201

Change-Id: I4cdc60703ae7f8ff316d2bc508fc9da6743e801b