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