Merge "Add SecureNfc state as dump log"