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

Change-Id: Ib8a16e0c0784ae449a1b0aec27b8f22cac83803c