Merge "Change how VoWifi status and wifi status are calculated." into nyc-mr1-dev