Merge "Remove usages of @hide methods in telephony code."