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