DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop() am: 3fe282a78e  -s ours
am: 8080442c99  -s ours

* commit '8080442c99578192d91eb8fcc23ac9cc0c805587':
  DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()

Change-Id: Id550b4448b5f3eab200c519e347e876579a4cc4c