Merge "AVRCP: synchronize around mMediaController" into oc-dev
am: 1ed348039a

Change-Id: I984a8d0cee9f2bbda6be3ed3861223707dbb1ba2