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

Change-Id: Ie09ae03bb81a03bef201bd41c05eafd56f5d09be