Merge "Have AvrcpControllerService own the active device" am: 81bf21cd5e am: e57e775fb2

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1611493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I412f21c49400f54c9a0972586e10a9354c993f55