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

Change-Id: I0033a5aef1ab8b316ac009e2f3a73515fce5ca72