Merge "AVRCP: synchronize around mMediaController"
am: d7e7b38cd3

Change-Id: Ia833281da8820a7b8ee6f16402dc65d165858a2c