Merge changes from topic "cherrypicker-L56500000960243519:N87700001362502878" into udc-dev am: 1fc671f76f

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

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