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

Change-Id: Ic0d684e4a5a1c8df7a48d7f891570540648b0875