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

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

Revert submission 16766159-revert-16624154-carrier-privs-intent-YNFCKNRVHL

Reason for revert: Restore original CLs after fix the break
Reverted Changes:
Ib9587ed75:Revert "Move carrier privilege intent resolution t...
Iedd36d302:Revert "Move carrier privilege intent resolution t...

Change-Id: I717760a0b5be335bffd739c0ea6a730e7a03bb1f
1 file changed