Merge "DO NOT MERGE - autofill cts: Use window change event to fix flaky test"
am: 91ec0f86e0  -s ours

Change-Id: Ifd503765509e08b26286320856d6cdd39511e42c