Merge changes from topic "tc_change_23042206_43" into udc-dev am: acc1e1b6

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



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