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

Change-Id: I89e4095079d4d7357218c4c619bef3a3b61acf93