Merge changes from topic "tc_change_23041807_28" into udc-dev am: 16c993d0 am: 9e8742ac

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



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