Merge "Fix null pointer exception on AvrcpTargetService"
am: cd4a4fe1b2

Change-Id: Ie1b95eb53c8f1a05df932a89cabe6cc796ec9ab7