Merge changes from topic "br-cts-hsum" into udc-dev am: 82a2b5e93c am: 60c20b6b0f am: 66ce0276ea am: 0e44e10865

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

Change-Id: I3e61ae7067b64b75d7ef671b7a40c13419f9006c
Signed-off-by: Automerger Merge Worker <[email protected]>