Merge changes from topic "br-cts-hsum" into udc-dev am: 82a2b5e9 am: 40a4dbd9

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



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