Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" am: 6654c61493 am: 2ead7df21b am: 9837467ff3

Change-Id: Id54c073b6ecfb55d2a02086ea83c415d3dca6068