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

Change-Id: Icdb4fe230ec44cc23a4722097e1bf885a2a79bc2