Merge "Only Run NFC Beam Test If Beam Is Supported"