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

Merge "[automerger skipped] Merge "Fix test flake in sysui test suite." into udc-dev am: 42a3460f am: cec69423 -s ours am: 73d9e785 -s ours" into udc-qpr-dev-plus-aosp am: 25bb2f9f -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: Ia56c9be59f96117884726886b12b9e46dcd7ed93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>