Revert "Move carrier privilege intent resolution to CarrierPrivi..."

Revert "Move carrier privilege intent resolution to CarrierPrivi..."

Revert submission 16624154-carrier-privs-intent

Reason for revert: Breaking VcnManagerTest and ConnectivityDiagnosticsManagerTest
BUG:217412107
BUG:217412690

Reverted Changes:
Idc7c2c434:Move carrier privilege intent resolution to Carrie...
Icdf82d070:Move carrier privilege intent resolution to Carrie...

Change-Id: Ib9587ed75d7e868aa17d475b21a30f68e8a5756f
1 file changed