am e7668dda: am 422d5b01: Merge "Avoid race condition that gets PanService stuck in STATE_DISCONNECTED."

* commit 'e7668dda0cd1f16e4161e6f0a64c685efc1ed25d':
  Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.