Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into mnc-dr-dev am: 2a2612335a am: b04d7559e4
am: 5bd1e81103

Change-Id: Ieac69289983354daef9be1b21627b802576ee289