Merge "Add initial network security config implementation" am: 8c35820720
am: 0bafbbfcb4

* commit '0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
  Add initial network security config implementation