Merge \"Change how VoWifi status and wifi status are calculated.\" into nyc-mr1-dev
am: 59a22f8c3d

Change-Id: I7f612b13e5d61ba65c1be4b81c6af9eac1251f57