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

Change-Id: Ib76c1f59d811c76a4d44c9ca172599214631610e