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

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



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