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