[automerger skipped] Merge Android 12 am: 7833269f0b -s ours am: 91a7679d3e -s ours am: f9c139434e -s ours

am skip reason: Merged-In Ifaf3cdb2ee959482c8a9c8bd134e3fd444483aa6 with SHA-1 22832bd88d is already in history

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

Change-Id: I400c5cc9bd45f8ca149c85c5dbf80a101ac0a2fc