Merge changes from topic "tc_change_23031509_16" into udc-dev am: 2e9a61eb

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



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