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: Ife6937336e05750069262c022d9d2fd88f2a464f