Merge "move removeActiveDevice out of mBtA2dpLock scope" into q-keystone-qcom-dev