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