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: Ib137e40700ed1d167f1736088c1c40e2adb16b4c