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