Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553  -s ours
am: 0e11e0d961  -s ours

Change-Id: I800746b8b1fc8e63eb78a83632d9eaac9abebcd2