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