Merge changes from topic "cherrypicker-L21100000961067008:N34400001375316978" into udc-dev am: b0594f1dee

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

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