Merge "nfc(api): Pass package name to reader, discovery AIDL calls" into main am: 34eacbbf

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



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