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

Change-Id: Ifef3104f3cad8e0ac4212c7f7601afde8b094a9e