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