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

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

Change-Id: I06eb347f17a45a5948a5d4c842a3211d9b5788cb