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

Change-Id: Ibc85713ca53c7bada06e1786434442d5524522ee