tree afd9d94f51b810de002b119b61613bc36be4f741
parent 9211a8fc38417576a417db22468283b568472ea7
parent 4bd0f6bb2af5939131260f6abce3aca793795bce
author Patrick Rohr <prohr@google.com> 1646121568 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646121568 +0000

Merge changes I3b7913c5,I9c1d6294 am: 4bd0f6bb2a

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

Change-Id: I127a1454559c97d3901fb7444f8cd9f31bbd39dc