Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 89ca9dd063 am: b541b5fecf am: c5241a3cd1

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

Change-Id: I3a376716eb2e3d25aa60921265ffbe3dc8f093a6