Merge "Replace NPMI#isUidNetworkingBlocked()" am: 9113cf2872 am: c48b6bb362

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c9f22befc69af4b4dc796d7fb432314cf8e3c3f
tree: a1ad4b98079fd64b974f23bd9a44b198c65e5eb0
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS