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

Change-Id: I6f10764ec18ff55fdd3af3f0f84e568ca8130275