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

[automerger skipped] Merge "Add an API to listen for changes in network blocked status of an uid." am: 54976574 am: e312cb7e am: d66691c3 -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/+/1612823

Change-Id: Ib66aa700dadfb0f61dec05429ace186f87040ad7