Merge "Don't remove auto-connect priority for A2DP connected devices"
am: 7b7567ceea

Change-Id: I2f60a93511e356b3ae29991ea3b40fc7455578e7