Merge "Simplify the setA2dpService() implementation so it is less error prone"...
Merge "Simplify the setA2dpService() implementation so it is less error prone" am: dea5691f am: 58828311
am: 01684c49
Change-Id: Ie68ae6c13d808c8f9b0bc96ee39a0816c0add5a6