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: 159bb07e am: 3297f727 am: f264af88 am: 2af4feeb am: e585dae3 -s ours
am: c06593e8
Change-Id: I749145ed8765bf697154038dcc435d541c34b8b5