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

Merge changes from topic "br-cts-hsum" into udc-dev am: 82a2b5e9 am: 60c20b6b am: ffebf33e am: 9f755382

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



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