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

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

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



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