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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If89417c4ec8b83df1d638616e1eff40b1f9db7fa