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
Change-Id: If65eab1ca7f9409fc47b522df8be6a05e73e7878