Merge changes from topic "cherrypicker-L76200000960273407:N31600001362949182" into udc-dev am: a1599af27c

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

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