fixup merge

remove duplicate android_framework_opt_telephony