Merge "Move carrier privilege intent resolution to CarrierPrivilegesTracker." am: 2e20da3623 am: a512173679

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

Change-Id: Ifc0c3639dbbe46e9a61e53af6e6f410e2545b04f