Merge "audio service: fix rapid succession of A2DP devices connections" into oc-dev