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