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