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