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

am skip reason: Merged-In Ibd786995cc6b8252aa5ce07d2aea5977ae2551db with SHA-1 d0e22c52ed is already in history

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

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