Merge "Fix usages of @hide APIs in Telephony from Telecom"