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

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

Change-Id: Id91c6de75e524080d15e2508007d5de997c7fd92