tree b2e91feedd71e6c58969ef434088a86e28409643
parent 41eed1ede22eb29e3bc434ae1ed7db3c5e3da8d1
parent 4bd0f6bb2af5939131260f6abce3aca793795bce
author Patrick Rohr <prohr@google.com> 1646121581 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646121581 +0000

Merge changes I3b7913c5,I9c1d6294 am: 4bd0f6bb2a

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

Change-Id: Id3a649c64d309f527b216e0404cadaace6ff8cc8