Merge changes from topic "tc_change_23031509_19" into udc-dev am: 796b0b80 am: 113687c9

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



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