Merge "AVRCP: synchronize around mMediaController" am: d7e7b38cd3
am: fec0498dbe

Change-Id: Ic9d82722982c44547b3ea99b93a286ab27ceb2c8