Merge "Add NETWORK_SETTINGS to SystemApi" am: 0ab508981a

Change-Id: Ie81ece88b9375ffd465c8bb68b17a0c4500dd025