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

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

Change-Id: Ib142bcd99a6c6932bb3c404d364a391cebec6b76