Merge "Hide APIs exposed for Telephony mainline which is no longer needed in...
Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev am: 98f6a63b am: 128e3972
Change-Id: I20c9ebbc14756ab96acce0dccc835571e00ab1c4