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