Merge "Remove NR NSA from voice network type" into rvc-dev