Merge "User restriction to disallow outgoing NFC beam" into lmp-dev