tree fd2b34c10712ec0703ebf29c1bd1fa564792602d
parent 27955ae85b1f6122a77f3216eb3a1b04e2b674ba
parent 090cc9ea640b1ef1bab7038c7b37dd4b52fd72d6
author Treehugger Robot <treehugger-gerrit@google.com> 1614717490 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614717490 +0000

Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5 am: 7afcfc90ee am: 090cc9ea64

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4be300f99c296816bef118389fe0c0f4effb7a9d