Merge "Revert "remove getName() from CachedBluetoothDeviceManager""