Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: cb4e4712b8

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

Change-Id: I54758c3e9ec37c68d45360afb10a322f749564a9