Merge changes from topic "st_cts_flake" into udc-dev am: 1030b6c6 am: 751346a9 am: a27fcd7c

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



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