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

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

Change-Id: I564421416ae29ce7ccd7cee19787f8263a862529