Merge "Avrcp: Fix the potential NPE in AvrcpController jni callback"
am: 250c25eb0d

Change-Id: I9e170e597f243cc8faf6d15f7ac6b93efa31e10e