Merge "Add NETWORK_SETTINGS to SystemApi" am: 0ab508981a am: c4f123463a

Change-Id: Ic671b59c116b27ee5bbc6ced29ea04086587a9d3