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
am: bdd599cc
Change-Id: Ie09ae03bb81a03bef201bd41c05eafd56f5d09be