Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 07f7d30449

Change-Id: I30eefa35d19f0a2dd8382fc3f63470d1aeb0dea9