Revert "Revert "Move carrier privilege status checks to CarrierP..."

Revert submission 16775265-revert-16665236-carrier-privs-status-check-MZYTAFTHGR

Reason for revert: Restore original reverted CLs after fix the breaks
Reverted Changes:
I1a1081ed1:Revert "Move carrier privilege status checks to Ca...
I6c7f3a075:Revert "Move carrier privilege status checks to Ca...

Change-Id: I63f8e3e5381090d455ca89363b588bd71be31626