[automerger skipped] Merge "Add checks when retrieving data for the JNI layer...
[automerger skipped] Merge "Add checks when retrieving data for the JNI layer for AVRCP" am: f3d5b5fc
am: 0841b2a1 -s ours
Change-Id: I5d8409e14e1604ca09e938dd84e844a40fe5f70b