Merge changes from topic "tc_change_23042206_46" into udc-dev am: 8178b081 am: 244a1e81

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



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