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