Merge "Merge changes from topic "iorap-perfmaster-fix" into rvc-dev am: 5c0b30caab am: 961be020ed" into rvc-d1-dev-plus-aosp am: 3eefddd40d am: 2707e6e2db

Change-Id: I1b21f190e2f8534eb4cef96d0531b7e64b24ddbb