Merge "Improve A2DP autoreconnect policy"