Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-dr1-dev am: 2b689e63ca
-s ours
am: 096e14d92f
-s ours
Change-Id: I1bec0f5ef17946fa49cdd2aa36ebc51f3d3c1d23
This commit is contained in: