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