Merge "Re-hide ServiceState#getDataNetworkType" into rvc-dev