Merge changes I30f8814c,Ifdf67318,If312b8f8 into main

* changes:
  Rename hasCarrierPrivilege... to isCarrierServiceUid...
  Detect discrepancies in subIds
  Allow carrier service UIDs to access their own WiFi networks.