Merge "Add carrier config keys for RTT-VT compat"