Merge "Remove connection manager picker from Telephony" into mnc-dev