am 896f738c: Merge "Allow non-persistent manual network selection." into mnc-dr-dev

* commit '896f738cdddec8cfda82b177e3a60c5a85004229':
  Allow non-persistent manual network selection.