Merge "AVRCP Controller disconnect browsing before connect"
am: 189ddb2a80

Change-Id: I2586d0f492bb6c26e61a89dad59cd4d81ff77a3b