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