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