Merge "hal: Avoid A2dp route updation for delayed a2dp/hfp disconnect"