Merge "Remove usages of @hide methods in telephony code." am: 841859205b

Change-Id: Id16457402dafae755582d06e67b9a9f7cc98bbc3