Merge changes Ie1645eed,I91832784,I6bdf56b1

* changes:
  Fix cannot enable SoftAp after Emergency Callback Mode
  ActiveModeWarden: Exit emergency mode should not start a new ClientModeManager if one is already present
  Add shell commands to test Wifi handling of emergency call/callback mode
tree: 2a709c268852fc7f29dddd85bd1a4ff1b20bee11
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg