Merge "Fix VoWiFi prompt when dialing in airplane mode" into nyc-mr2-dev
am: a63bdb0e47

Change-Id: Ide392cc560cadddd68697ac124911ac1022962bd