tree 2dafb2838de527ff4ab74398aef45f63c3aaf586
parent 386e1702a5d1951605b611dfbda83070cb21c9c0
parent c5e61cc54026265e073728c347fd424b789f398b
author Lucas Lin <lucaslin@google.com> 1635228585 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635228585 +0000

Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540

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

Change-Id: Idce97c0d4ca8082b8ddafec726a2c3dc07ea4fc6