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