Merge "Move Setting constants for NetworkStack"
am: 587ee7240e

Change-Id: Ieedf7af48c408637c11c4ea7fe4cc93261ce613d