[automerger skipped] Eliminate boilder plate code for recovering service in...

[automerger skipped] Eliminate boilder plate code for recovering service in NfcAdapter am: d6dc4967 -s ours

am skip reason: Merged-In I33ef62ac567a48f46035adf9ea538996e4743a2d with SHA-1 00bec5f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28461226



Change-Id: I3795fc1f7870f5e1fc2e7737e0a9683cdf8cd971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>