Merge "Fix volume change nullpointer exception in AvrcpTargetService when configured as A2DP sink"
am: 25a4a7e118

Change-Id: I3f276ae49ca208b419d8e3a38c9bd5dbcda5b659