[automerger skipped] Merge "Implement NfcServiceManager and...

[automerger skipped] Merge "Implement NfcServiceManager and NfcFrameworkInitializer" am: 7e359a70 am: 941d9285 am: 53c1f02c -s ours am: 067e1ad7 -s ours

am skip reason: Merged-In Ie11e888cb852740d806d06c0c725bb2a4544e13c with SHA-1 d8c67dd8 is already in history

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



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