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: I7778ac480d4a4d0dfb2b2afc91a5a66b8e15aef9