Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892f am: 8aef6d46 am: d5d24218 Change-Id: I4bd7b2c7018300a20895ec2e8a2e27737c04ffcc