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