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
am: 2bb7707e -s ours
* commit '2bb7707e':
Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]