DO NOT MERGE - Merge ab/7272582 am: 225f3ff620 am: 1e2b50733c

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

Change-Id: I079ea22b30672c3ff6913948a6e6aab046ed0b84