[automerger skipped] Merge "Move carrier privilege status checks to CarrierPrivilegesTracker." am: 019b5ad0c1 am: 5ec679af75 am: f9ad4dc68b -s ours am: 24e5266ac0 -s ours

am skip reason: Merged-In Iff4ba652ffc6e22bd89faff18ad36bbf985a55ac with SHA-1 cad7f0b217 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2037743

Change-Id: Ieb16e170231b0f2d7005049129b66d9aecc2023f