[automerger skipped] Merge "Revert "Add an API to listen for changes in network blocked status of an uid."" am: 677f4420 -s ours am: 45031cd1 -s ours am: a1ffcbd5 -s ours am: 0783e482 -s ours

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

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

Change-Id: I0f60368cf5ea1a0628ee7237c951c9a5946bcd2f