tree 0404f549251618b5d5e0d6b92dc7b4bf638da508
parent 85b1837b214d51a153f934e7cab74764cdb71d2c
parent 27f85f972ff3a55af93eeece7b78dcd994ce7c75
author Remi NGUYEN VAN <reminv@google.com> 1641990084 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641990084 +0000

Merge changes Iad0b0d52,Iee727308 am: 6eb0654f9b am: 27f85f972f

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

Change-Id: I61ed3eabd942af24f499605cfe5c5b9c883bfe7a