Merge "Adds new configs to support 5g+4g opportunistic switching." into sc-v2-dev