Merge "Fix test flake in sysui test suite." into udc-dev am: 42a3460f7c

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

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