tree b39b927045ff7f1f96071e6733996c1f394914e4
parent f5590e79e38dcc65feb4a74b45cd7821f13ad29d
parent 02eea987c0383acb05c66c46ed18912bb1f104f0
author Chiachang Wang <chiachangwang@google.com> 1622711618 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622711618 +0000

Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0

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

Change-Id: Ib1aa32fbf6f2904bd88c418af51db8128ec0bfc2