Merge "[Telephony Mainline] To mark @hide for mainline module reverting" into rvc-dev am: 4ce79c63de

Change-Id: I5476f3696c09330d0160a23db9be04bafd65199c