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