Merge changes from topic "tc_change_23030910_18" into udc-dev am: a5991fc129 am: 402309385a

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

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