Merge "Delete hidden API in Telephony.ServiceStateTable"