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

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