Merge changes from topic "cherrypicker-L79500000960657219:N07500001368857425" into udc-dev am: 60437e59de

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

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