am ed7fd99f: am a66a067a: Merge "Mark CARRIER_PRIVILEGE_* constants as @SystemApi." into mnc-dev

* commit 'ed7fd99f09f6f53c4babd6eeb8264040eef61408':
  Mark CARRIER_PRIVILEGE_* constants as @SystemApi.