[automerger skipped] Merge "Add AvrcpControllerServiceTest" into tm-qpr-dev...

[automerger skipped] Merge "Add AvrcpControllerServiceTest" into tm-qpr-dev am: d8cdf92f -s ours am: a0d0ec73 -s ours

am skip reason: Merged-In I211b4e5ee0c5e850cdbd6608d2a1d04b0d935ef4 with SHA-1 a108a06d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20830877



Change-Id: Ie9a20115a33554dae455973f150367a599217d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>