Merge "move storeActiveDeviceVolume out of BtA2dpLock scope in removeActiveDevice" into q-keystone-qcom-dev