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

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

Change-Id: I3078e98ae17b4b1a527dad0eb2450f46ffe508f8