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