Merge "Eliminate boilder plate code for recovering service in NfcAdapter" into main