Merge changes from topic "tc_change_23030910_17" into udc-dev am: da2c76b9

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



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