Merge "Add callback for AVRCP 1.6 support" am: 58b5789cde
am: 16e5c08cbd

Change-Id: Ie38c7ea468285625a6a0e88d5abfe43bb977b504