[automerger skipped] Merge "Move carrier privilege intent resolution to CarrierPrivilegesTracker." am: 2e20da3623 am: a512173679 am: c645ce8839 -s ours am: 8000fe7e0c -s ours

am skip reason: Merged-In Idc7c2c434b78c1af62e89ef3b9eb48e4fa540d16 with SHA-1 610f2f5faf is already in history

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

Change-Id: I582ceedc85846520cab11b42b1123d59bc395408