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

Change-Id: I0b9a4548f6c1ef41960302257a8b8b518111ec98