Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev
am: 2a2612335a

Change-Id: I8d4d89273541425351b4d46690156fa60cc98c92