tree ec791abff9871b4c97d73bf968b7e35f6adf34ee
parent 68114fe408b996e67a4679c9ddfc186a54fe3deb
parent cec294d1b49f620cb76e2862dc34d5aef82106ae
author Mark Chien <markchien@google.com> 1624282617 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624282617 +0000

Merge changes I270ff43c,Ifc7eee24 am: cec294d1b4

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

Change-Id: I435e69ba3fc71cf56a7bf8cc54b394831615fa57