Merge changes from topic 'NCI-2.0'

* changes:
  AID suffix registration.
  NCI2.0 update LF_T3T_PARAMETERS of 18 byte.