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 am: 878ad0e7 -s ours
am: 6906494e
Change-Id: I749145ed8765bf697154038dcc435d541c34b8b5