Merge "AVRCP Controller Shuffle/Repeat support" am: 9345361d28
am: 8d142c3aed

Change-Id: Ie7d209ae69ad180b7c5a491fc6d50bf5ab10a058