Merge "Simplify the setA2dpService() implementation so it is less error prone"