Merge "Reduce the flakiness of carrier privileges check" am: e7036bec68 am: 6449c9d99e am: 2901fe8659 am: 430ab6a736

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

Change-Id: Ib77e1ea6e808f49d92fd728c7c4b722d7404e4cf