Telephony: fix merge to android-4.3_r3