Merge "nfc: Eliminate boilder plate code for recovering service (contd)" into...

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

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



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