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

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

Change-Id: Id7996b99d34a7678e637a9f9d3847a4c41488cdd