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