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

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



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