[automerger skipped] Merge "Reland "Add an API to listen for changes in...

[automerger skipped] Merge "Reland "Add an API to listen for changes in network blocked status of an uid."" am: 66794f91 -s ours am: 10f14e41 -s ours

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

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

Change-Id: Iffa4b2d7c7a9d03a70a6a01a545bb91e88bfebb1