Merge changes from topic "tc_change_23042206_38" into udc-dev am: fca41292...

Merge changes from topic "tc_change_23042206_38" into udc-dev am: fca41292 am: f16d8273 am: 3acc3144

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



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