Merge "Fix usages of @hide APIs in Telephony from Telecom" am: 838783222f
am: 1b99428ee3

Change-Id: If8835b39077b9c634c12264d198e521c65c1888e