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

Change-Id: I90f4e6a4b50f114bf605c45b4b3d2dcd47dea7bb