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