Merge "Only get WiFi status based on RAT extras" into nyc-mr2-dev