tree 33831988033668856ee7b7757e6ac6248408954c
parent 7a6f3364c9b50638299bd4c6abbd1fa6fc14d8cb
parent 3499d730164e75457c4c1a22e84a1d4a64c63d7b
author Remi NGUYEN VAN <reminv@google.com> 1625628764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625628764 +0000

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

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

Change-Id: Ic26bab1331de18f8b362849e275f986d0b7fa97e