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: 751346a9 am: 7720c7ed am: 1bda6e70

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



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