Merge "hal: restore a2dp during soft hand-off"