Merge "Allow reconfiguration of NFCEE routing techs at NFC disable/enable."