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

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

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