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

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