Merge "Have AvrcpControllerService own the active device"