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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I279528bf95a7cf575dad9965eac627cd52e6cca8