Merge "DO NOT MERGE - autofill cts: fix failing tests by window event CL" am: f168e8f43f  -s ours
am: c6c1abb628

Change-Id: I440227e4afa449fe2ff104567a6fc60d832c5854