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