Merge "nfc(api): Fix HCE services metadata name in javadoc." into main am:...

Merge "nfc(api): Fix HCE services metadata name in javadoc." into main am: 219a0d17 am: b03d0b49

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



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