tree 56c0e6b23a195b6f65447716728f3fb86f57e200
parent 43bb3a28562a0cb6e48f4fb385543265c00d8fd3
parent 6c1e049e2962a3462505d3c236e3ecb149a0bb7c
author Remi NGUYEN VAN <reminv@google.com> 1628148642 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628148642 +0000

Merge changes Ic33d8976,Ib5bd74d8 into sc-dev am: 6c1e049e29

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

Change-Id: I119dc7433cd8f5fa2ba1f997f7adef8985a3b492