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 am: 074cd25c am: 3a736ff1 am: 8edc09c3
am: 420091c7
Change-Id: I67262b5b54c3860eebe3672d337f21b3d823d907