[automerger skipped] Merge "Use NetworkStack on system image" into rvc-dev am:...
[automerger skipped] Merge "Use NetworkStack on system image" into rvc-dev am: 5016b84b am: c1c803b8 am: 86410076 -s ours am: 0cd3feea -s ours
am skip reason: Change-Id Ibc74edb88904f953a1e5e6ceef44c461f381c9cf with SHA-1 09153e24 is in history
Change-Id: I2fe196e192a2c92cdeccc5d862b9ef95f3481b11