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

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