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

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