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

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



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