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