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

Change-Id: If76a0d9e4d1ad4b96fdc8f403f320d8784d4768c