tree 48a3cee0938cecf4f7382ef19e73f7a817610a55
parent 053622dd00af17b7ab5f877080da8eccb64e2856
parent ab698db29185b03d9fcc3d3419ab5ae641029948
author Bill Yi <byi@google.com> 1631452938 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631452938 +0000

Merge changes from topic "presubmit-am-6a703b2542a2488da257f2abf8b1e346" into sc-qpr1-dev am: ab698db291

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

Change-Id: Ife475b0c43c51bb8670dc73b57198a0da6d82128