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