android: telephony branch change

Change-Id: I601311acff8c832a14a7a13585c708e4c6ec3439