Merge "Reduce the flakiness of carrier privileges check" am: e7036bec68

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

Change-Id: I3fee8061cbc8c7ebd7203d66710ff3c43dff79cb