Merge "AVRCP: Fix concurrency issues with MediaController"
am: fa3d29eb23

Change-Id: Id38297009fd00b74c13b700342b172e97820c4b2