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

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

Change-Id: If7b1016a95e01b004294f33712f50a48590855e1