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

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



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