Merge changes from topic "cherrypicker-L42900000961040401:N31900001374826989" into udc-dev am: 9e920c73fa

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

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