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

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