Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e9baf825f1 am: 7264b4e737 am: 33c9f8811d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4be300f99c296816bef118389fe0c0f4effb7a9d