tree 59688ddfb73a1fcde8876d7d6c38da2868c0fe38
parent 1c3a63dbaa33f1b27bd9cf517b87abf238e31b56
parent 9eb4ab0ae7eb67dd1fe59a374876704d24d2f482
author TreeHugger Robot <treehugger-gerrit@google.com> 1636996943 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636996943 +0000

Merge changes from topic "presubmit-am-0570772c8ea242f5b67125f81fe66fee" into sc-qpr1-dev am: 9eb4ab0ae7

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

Change-Id: I9fa42227a0647e41320fccdddbfb0a99928e0c55