Merge "Revert "[Autofill Framework] Fix presentation event logging sequence."" into main