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
am: 90460883
Change-Id: Ibbc6ab46d58b258b881c508e5ccf6e09f5b405a2