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