Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev am: 52a836d49c

Change-Id: I994c1752bbaefc543aef1c96dc56cdccfec0e002