Merge "Add null pointer check in A2DPService"