tree b2e91feedd71e6c58969ef434088a86e28409643
parent c1f3bb29cebe3f3a63eac20854bf556b4cb1ecbd
parent d66af86b104ad73f38ae8bf5b2f95ea392f68aa0
author Patrick Rohr <prohr@google.com> 1646122920 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646122920 +0000

Merge changes I3b7913c5,I9c1d6294 am: 4bd0f6bb2a am: d66af86b10

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2002172

Change-Id: I9027708c8145490b7c96fc4ac579f49d7040c0f9