Merge "Remove Settings constants for NetworkStack"
am: d32d766a04

Change-Id: Icba412d89c10a64d7e5d3d396b6a1364f7ad6bc5