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

Change-Id: Ie29d7f1e7ceb042b8f8c3c69aac3938f7b00559f