Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb

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

Change-Id: I35fe76f9cfedf0619f64023e9111d9a50cc3c41c
tree: a4b6de9cfa23a0ccb42864d1a3eb6effb3315d25
  1. core/
  2. services/
  3. tests/