Merge "[automerger skipped] Merge "Fix test flake in sysui test suite." into udc-dev am: 42a3460f am: cec69423 -s ours am: 73d9e785 -s ours" into udc-qpr-dev-plus-aosp