Merge "Add an API to listen for changes in network blocked status of an uid." am: c262455617 am: 5580953ba4

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

Change-Id: I5f64c0872ba298e8b7a10f5a4348c35ff19a9bb5