Merge changes from topic "tc_change_23031706_16" into udc-dev am: 9572b125

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



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