Merge changes from topic "cherrypicker-L86300000960661534:N86700001369044773" into udc-dev am: 28c597c265

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

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