Merge changes from topic "tc_change_23040307_21" into udc-dev am: 1f0d4d31 am: 5f5b5fd3

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



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