Merge "Add test for CSM#[get|set]UidsAllowedOnRestrictedNetworks" am: 33b4929cfe

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740740

Change-Id: I1f82fdb084fc73a4db69f2ba8eba96d8e8010c7a