[automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 2bb1da3473 -s ours am: 00a2a4c7ce -s ours am: 0a45e2c173 -s ours

am skip reason: skip tag Change-Id Ib9949b8619c6b148f73630b314c4113d76c31ec1 with SHA-1 cb5fd4a670 is already in history

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

Change-Id: I682d85048801567ff9cffbc0e7ded0290ca86bdb
tree: 543986eeca359d3e0ac2c1354ea0059cef4b833d
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS