tree 856b4a663b687758a4b65c35122a1bec3094a808
parent 3ae845be9d863e82a2089cf77b6b9a2ef64b266e
parent b675eba4c1b950ce8393a87df27df36143243307
author Chiachang Wang <chiachangwang@google.com> 1622712156 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622712156 +0000

Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0 am: b675eba4c1

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

Change-Id: Iede15400f50e5e0f37a95f59b924d8b7dd698509