Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master

* changes:
  Merge changes from topic 'NCI-2.0' am: 430dded515
  NCI2.0 update LF_T3T_PARAMETERS of 18 byte. am: e7ecebae11