Revert framework_opt_telephony to aosp