[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 -s ours am: 0463fc6b -s ours
am skip reason: Change-Id Ibc74edb88904f953a1e5e6ceef44c461f381c9cf with SHA-1 09153e24 is in history
Change-Id: Ibeca1522a1551cc17ce75219a5749bcfc1bd8b21