Merge changes I7fae1964,Ic7cc9e1d into main

* changes:
  Add carrier-privileged app bypass for start/stopTethering
  Fix CarrierConfigRule#setHoldCarrierPrivilege race