Merge changes I144ad1aa,I7f39c2e3 into udc-dev am: 6ed2305783

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/21503767

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