Merge "Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabled" into jb-mr1-dev