Merge "Don't remove auto-connect priority for A2DP connected devices"