Merge "VCN: Remove Telephony hidden API usages" into main