Merge "HeadsetClient: Return from stop() if not started"
am: 7fb7e20e70

Change-Id: I576f22b6ac1eee49582399c2259afd5eb0d7eee9