Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab am: 745952eac8
am: 70626e3b94

Change-Id: I2bec503c5ffac156b679a48c09591458ab716789