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

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

Change-Id: I9bdf5127376319fd94449cb79bc387535d32d9af