Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 2933a04749 am: 6f9bce51aa am: 80804587f2

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

Change-Id: I3a376716eb2e3d25aa60921265ffbe3dc8f093a6
tree: 517e23ebad4264ac36109c6036d5f8892611d62a
  1. core/
  2. services/
  3. tests/