Merge changes from topic "revert-22327091-br-cts-hsum-PYDKVUKIOU" into udc-dev am: 619bfd92 am: f9956d78

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



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