Merge "Update NFC AIDL module to target SDK 35" into main