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

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