Merge changes from topic "tc_change_23040307_25" into udc-dev am: ea157292 am: 98a90cdb

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



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