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

Merge "Mark test as not flaky" into udc-dev am: 40257d4a am: 7da2bc83 am: 77cd4fe7 am: 3539af7c

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



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