Merge "Fix test flake in sysui test suite." into udc-qpr-dev am: 2f04241d am: bb0b8778

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



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