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

Change-Id: I45a345a852ca7b47790868c568d8c6acb65c4bac