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

Change-Id: I0b3193dc60a7d74f49b925cc27cd0323962436e8