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