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

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

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