Merge changes from topic "fix-flake" into udc-dev am: 334b55d7 am: 7843889b

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



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