Merge "nfc(api): Add formal APIs for new ApduServiceInfo params" into main am: fec8801925

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

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