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

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

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