Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev am: 52a836d4 am: e9a7b4da Change-Id: I711aa49fe44d51b5e2738c360d7cfe8fb58740d5