Merge changes from topic "tc_change_23042206_41" into udc-dev am: 25cf447d am: 73895eb1 am: 92dabf44

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



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