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 mnc-dr-dev am: 2a261233 am: b04d7559
am: 5bd1e811
Change-Id: Ieac69289983354daef9be1b21627b802576ee289