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