[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: cd3ea1f002 -s ours am: e58eafa8c4 -s ours am: 363f1b34c4 -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/+/1646326

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