[automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892f -s ours am: e19208a1 -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 c1307318 is in history
Change-Id: I120f81565e4862505c4fe36793943d13391e2486