Merge changes from topic 'am-0fe9238e031841a8802281f7e75ee086' into oc-dev-plus-aosp

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