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

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