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