[automerger skipped] Merge Android R am: d1299a41b4 -s ours am: e3c39be0d1 -s ours

am skip reason: Change-Id I3c77335b908d1ae9b675ef482589858ed27a9b97 with SHA-1 d3905c2fca is in history

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

Change-Id: Ie58e1874af5194598ec5aff7d62654c4c304e140