Merge "Hide APIs exposed for Telephony mainline which is no longer needed in R." into rvc-dev