Merge "Making Bluetooth OPP file transfer intent generic"