am 31e19c52: am cbc98c1d: Merge "Allow non-persistent manual network selection." into mnc-dr-dev

* commit '31e19c52f1bfb3c0b4c8e305eecf04b34a8584d4':
  Allow non-persistent manual network selection.