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