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