Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-mr2-release