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