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

Change-Id: I7bcf2f77f5ba100f9926f1932811d54e385c7587