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