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