Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev am: c6c9b2aa66 am: cd097ff856
am: 2bb7707e00  -s ours

* commit '2bb7707e00922d2f614b8d92bdf3e62dfa6fd80d':
  Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]