Merge changes from topic "tc_change_23031706_16" into udc-dev am: 9572b125 am: f1b5ceaa

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



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