Merge "Simplify the setA2dpService() implementation so it is less error prone"...
Merge "Simplify the setA2dpService() implementation so it is less error prone" am: a9d5799e am: c0770e5b
am: e3cc6053
Change-Id: Ie68ae6c13d808c8f9b0bc96ee39a0816c0add5a6