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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53f5fb0996ad08c8a44c0560ab72725c47e39215
tree: 084ec401a938bd8525f83dc24a0917aaf2b04af3
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS