Merge changes from topic "tc_change_23042206_36" into udc-dev am: 15722475

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



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