[automerger skipped] Merge "Add additional SystemApi for NetworkStack" am: 2ffdcc26b0 am: aee43d2387
am: 60d32999db -s ours
am skip reason: change_id I8b5b80ea7b267357eb0387d504a2f78358d6d502 with SHA1 39fbb92bbb is in history

Change-Id: I023f2b404c2444289ddb016a88b731e6813b7edb