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

* commit 'fb2e7a02300d8a7870dde2e3c40c26fd5662772b':
  Remove connection manager picker from Telephony