Merge "Revert "comply with VTS requirements"" into udc-dev am: cb902f0581

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/22298905

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