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

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

Change-Id: Icb020e69e430cc6f7d2492fd03045faf9bcac438