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