[automerger skipped] Merge "Use NetworkStack.getService in NetworkStackClient"...
[automerger skipped] Merge "Use NetworkStack.getService in NetworkStackClient" am: 79f73061 am: 1779c59a -s ours
am skip reason: Change-Id Ibeaeff5890631e14581a084863d9aeb3178c5d5c with SHA-1 62ea8f72 is in history
Change-Id: Id9c5d55619587a18fcf5a72eed9e0314c7b2c2a4