[automerger skipped] Merge "Remove usages of @hide methods in telephony code." am: 841859205b am: 18f85c674a am: 995383072c -s ours
am skip reason: Change-Id Ib40da3702c64c36613555d61451442eeaf1f2f35 with SHA-1 862ece814d is in history

Change-Id: I077e88c48412031e0983b6c16ec8e591a9d5f199