tree dabe8c9ca7147a29ba6d0d9a47ca3a59db9c7c20
parent d0fe221ed22134402435fbdea1eee8ad5d7b81fe
parent 47efed8ae0ab12a74eaae26b78d80f1b598d09f2
author Remi NGUYEN VAN <reminv@google.com> 1625629479 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625629479 +0000

Merge changes I99ce72bd,I5a11a802 am: 527ffb6f0c am: 3499d73016 am: 47efed8ae0

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

Change-Id: I36a10873c930c961d1b8531abd97e0f295b265a9