Merge changes from topic "tc_change_23040307_24" into udc-dev am: bab70663 am: 33add716

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



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