Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into security-aosp-mnc-mr1-release