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

Change-Id: I14d62e2bbd98d5d7e6f07de749ea82c14c5d4af2