Merge "Let HeadsetClientStateMachine debug message be configurable at run time" am: 440dc5b18f
am: 42a05b32a3

Change-Id: If8a168fe536910926ba809caa020e776c43d96d5