am 79081ef8: resolve merge conflicts of 07b3ebc3d3 to mnc-dev.

* commit '79081ef81a599353807524dd75272bef55e2b4b2':
  Use requestNetwork with all transport types that hardware features report