Merge "AVRCP Controller manage active device" am: 9eb36944ea am: 9efa17f67c

Change-Id: Ib0605bd40270b51a668570910c4fe79baea29b33