Merge "Merge "Mark test as not flaky" into udc-dev am: 40257d4a am: fbe79d04 am: d97f113b" into udc-qpr-dev-plus-aosp am: 4aa8eddb

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



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