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

Merge changes from topic "st_cts_flake" into udc-dev am: 1030b6c6 am: 7b61d6f7 am: 673b2097 am: 7798b30e

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



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