Merge "[automerger skipped] Merge "Remove DeviceConfig usage from...

Merge "[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6 -s ours am: 56ac6f1e -s ours am: a8aa5abf -s ours
am: 2da6de04 -s ours
am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666d is in history

Change-Id: I050ca2f73920a20bb3ebd6419144ea39498253c0