Merge changes from topic "tc_change_23042206_35" into udc-dev am: cafdcda5

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



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