Merge changes from topic "carrier_id_aosp_cp"

* changes:
  support mno carrier id
  support privilege access rule for carrier identification