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

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