Merge changes from topic "st_cts_flake" into udc-dev am: 1030b6c63f

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

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