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

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



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