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

Change-Id: Iedd794e5d695e8c4534f2ce664f0b647d1509224