Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2799715 Change-Id: I5f3a8cc20f6e86a75e7abbaef80300265d7e4cfa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>