Merge "nfc: Eliminate boilder plate code for recovering service (contd)" into main am: a1c4fab3

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



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