Merge "Handle disallowed NFC beam restriction" into lmp-dev