Merge changes from topic "nfc_main_merge" into aosp-main-future

* changes:
  Eliminate boilder plate code for recovering service in NfcAdapter
  Add Test method to inject HCE data
  [framework] Add a flag for nfc persist log.