Merge changes from topic "bt-a2dp-fix-state-machine-timeout"
am: d669257379

Change-Id: I60f8397f872be63efdb13620dd54f615d0bcac17