Merge changes from topic "am-7f0575b5d09641f7a3715eefeb61bed8"

* changes:
  Merge "Add tests for the network blocked status change" am: af0de1a2e9 am: 43d8774f68 am: 9944d7f079
  Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab am: 745952eac8 am: 70626e3b94