Merge "Add a unit test testStopA2dpService()" am: f70a917a3b
am: 9ffe9c1577

Change-Id: I39d72d049849e425985f8ebab76cc4e533737710