Merge "Remove Mainline APIs for MmsManger and TelephonyManager"