tree 0376ede8f5bef08ad7688fc2e9b36a6da032e160
parent fa4e56de746545e13294bf7adb3eafde2ea17db9
parent af97e30d9fdac85262deffc69075e29fe8cd070b
author Lucas Lin <lucaslin@google.com> 1635229436 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635229436 +0000

Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540 am: af97e30d9f

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

Change-Id: I280e38cb067348c8f46fc64ee70b706d3ee5c9a4