[automerger skipped] Merge "Fix test flake in sysui test suite." into udc-dev...

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

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

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



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