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
tree: fd2b34c10712ec0703ebf29c1bd1fa564792602d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS