Merge "Paired BT devices are not displaying in volume control panel" into sc-dev am: 060a40095d am: 995ed988a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15460611

Change-Id: If518733f6b3d25a1ec81fca31427cf56e9988368