[automerger skipped] Merge "Add NETWORK_SETTINGS to SystemApi" am: 0ab508981a am: c4f123463a am: 6d20c0e20d -s ours
am skip reason: skipped by user ngeoffray

Change-Id: I8d874eba5aa1303ee01b369d9704de6c12329889