[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: 6fb58ec5 -s ours

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

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



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