Merge 'telephony-common and telephony-msim' into framework.jar