Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into...
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am: 71c51769 am: 963cc948 am: db7514b2
am: 842c86c7
Change-Id: I7bcf2f77f5ba100f9926f1932811d54e385c7587