[automerger skipped] Merge RQ2A.210305.007 am: e34aaaa70e -s ours am: cb11e48d27 -s ours am: 6ec12cf99c -s ours am: acb9df527c -s ours

am skip reason: Change-Id I05335737d1a64c8bd133025d91d3d714703512b3 with SHA-1 de6c093dcc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadd4d1fb8f9216f485e3fdd9c64c0bcdfbfefd96