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

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



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