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