Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008 Change-Id: Iba57cbfe6f3c41fc7c396098f0caa662d68b1e0e Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>