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

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

Change-Id: If2544421388b2f957c84e5a90e73b94449698828