[automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892f am: 8aef6d46 -s ours am: a2d6655a -s ours

am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 c1307318 is in history

Change-Id: I0c55d53bdc68424b14758055faa909ce5eba867c