[automerger skipped] Merge "Move carrier privilege status checks to...

[automerger skipped] Merge "Move carrier privilege status checks to CarrierPrivilegesTracker." am: 7dee61c5 am: 638fbe7f am: f1576114 -s ours am: f2228c65 -s ours am: 93d987e8 -s ours

am skip reason: Merged-In I5470538bc8d318147904bc5dd0efa135986ebb02 with SHA-1 9c6e2ac2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2037466

Change-Id: I2c33d578d060864f1e771b01632f247600532e36