Merge "Fix CTS for M-08" into udc-dev am: 7ae6c1ae94

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/23596000

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