Merge "Mark nfc HAL as updatable-via-apex" into main