[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: d84aa623 -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: I1b6bd2aaa6fe2b9fd0c3a03f025f9f3d8d1711f9