Merge "Declare STATE_AUDIO_CONNECTED in right place"
am: 8fdfd917d1

Change-Id: Ia5164a15d93e52babeafbdaadff87b28e751b9e5