Merge "Shamu: NFC: Remove UICC support." into mnc-dev