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

Change-Id: Ibbc6ab46d58b258b881c508e5ccf6e09f5b405a2