Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev
am: 539c15ec84

Change-Id: I63ff9c84bfb5582575f8e2098b02ff7f77a51287