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