Merge "Declare STATE_AUDIO_CONNECTED in right place" am: 8fdfd917d1 am: 2235a8778b
am: 7bd8017a94

Change-Id: I0228303df27cb690f308ceefaa26a3dc0e3e5e1e