am 5ffc6949: Merge "Remove connection manager picker from Telephony" into mnc-dev

* commit '5ffc6949287a2c8fcc606efc3a2dc43ae7e0fcc5':
  Remove connection manager picker from Telephony