Merge "AVRCP Controller during phone call"
am: 04a8541e37

Change-Id: Ib62edac7e8e96d5b50c31c9b0f59a452a5b64643