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