am 2f5fb6dd: Merge "Fix NetworkInfo CTS test." into jb-mr1-dev

* commit '2f5fb6dde3c3209cbb124c6d989c3c4addc4e130':
  Fix NetworkInfo CTS test.