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

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

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



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