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