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

Change-Id: Ieef9f041cef5cdd1bb7b7513ed821ab2e933e2e9