Merge "AVRCP Controller Media Controller not ready" am: 9bb57c1c2e

Change-Id: Iba68e472d94d13ccc50c09f7e3e0bdf3d933d9a0