Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into nyc-dev am: 159bb07e8f
am: 3297f727f6

Change-Id: I25d3274bbabfa1a12f86683f855e7de206b7c1d8