[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours
am: 56ac6f1ee7 -s ours
am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history

Change-Id: Iff0a09ebb17518634cefda2e8f351ca3d5ceeb7f