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

Revert submission 16665236-carrier-privs-status-check

Reason for revert: Breaking tests
BUG:217412690
BUG:217412107

Reverted Changes:
I5470538bc:Move carrier privilege status checks to CarrierPri...
Iff4ba652f:Move carrier privilege status checks to CarrierPri...

Change-Id: I6c7f3a075ccb047930d266912c60e0f6c40075a8
4 files changed