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 nyc-dev am: 45d21c45 am: 3f05431a am: bf4572a1
am: 8ad100a4
Change-Id: I4103a6efeccbbcc94aff45632af1474960f0fddc