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