Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" am: 2933a04749

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

Change-Id: I54758c3e9ec37c68d45360afb10a322f749564a9
tree: 51311ad7abf6f19a0ac3941333963995c20cc90d
  1. core/
  2. services/
  3. tests/