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