Merge "Revert "Use session id to uniquely identidy autofill ids for multi-session.""