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

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

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