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