Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission to shell" am: 1b06ec2530 am: a96493b7a5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675632

Change-Id: I9a94931334fe162c5f05c6c3a1628a41468a2d82