Changes to aosp_base_telephony