revert: "Change android_frameworks_opt_telephony to my fork"