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