Merge changes from topics "bt-a2dp-remove-redundant-alarm-free", "bt-a2dp-codec-init-same-thread" am: 51a906ba am: c42440e9 am: 558f9173 Change-Id: I69f764eaeb2fe1ecbdd6f485bc52d9112441beab