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