Merge changes from topic "cherrypicker-L55500000960281927:N08100001362972784" into udc-dev am: 050b246600 am: 9ea19fe876

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

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