Merge "Fix null pointer exception on AvrcpTargetService"