Merge "NFC: Unify ApduServiceInfo for on/off host."