Merge "AVRCP 1.6: media browsing support on Controller" am: 6b6400720a
am: 4bc507a1e0

Change-Id: I6eaeac9862595c5aab553bfaa2a538c37c03768b