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

* commit '04feedd439989363b629a7d596637d55cf92bbc9':
  Allow non-persistent manual network selection.