Merge "AudioPolicyManager: remove unnecessary device reconnection" into nyc-dev