Merge "AVRCP: Fix NowPlayingList looping" am: 8938b02fc2
am: bfc2b1d661

Change-Id: I1f28c5f3b029533e54db76e66b23a834a11a6a92