Merge "Fix MultinetworkApiTest for instant mode" am: f2987a79a2 am: a503dd1e70

Change-Id: I838f8968f980454f9ca61fb906fc16c8eeced834
tree: d3853915fd5e7384b3ffd0ab4b36980d7dd4000c
  1. tests/