Merge "Fix test flake in sysui test suite." into udc-dev am: 42a3460f am: 45ea8d3e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24101116



Change-Id: Ifb44c83a28c57cfcf1c154d00d004314b738ea77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>