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