[automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri...

[automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892f am: 8aef6d46 am: d5d24218 am: 0b80c024 -s ours am: 55ea2ab4 -s ours

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

Change-Id: Id933e543586895ab0cd220218f5bb5ca7cb230f6