Merge "Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline...

Merge "Merge "Revert "Revert "[Telephony Mainline] To mark @hide for mainline ..."" into rvc-dev am: 52a836d4 am: 17953fe9" into rvc-d1-dev-plus-aosp am: 70de09a4 am: d6790d74

Change-Id: Ic3cfc1c9466f54f0d7994236cf7f74d8b75a1b0c