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: ef4fc7bc
Change-Id: Ia660b335e53157628f6f34bd28bc3a9adca2b7f5