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

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

Change-Id: I3c10b132413e38844ceaa84ce3909f28490a0b68