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

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



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