Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master