Merge changes from topic "tc_change_23030910_16" into udc-dev am: 04b12095 am: 9a82f70c

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



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