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

Change-Id: If957f12a72f96864958cd93e74ff15846aa1eed1