Merge "Remove legacy "Carrier Wi-Fi" configuration constants." into rvc-dev