Merge "Mark test as not flaky" into udc-dev am: 40257d4a am: fbe79d04

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



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