Merge "Remove CachedBluetoothDevice.ACCESS_*"