Merge changes Ia25b28d5,Ic6bbd8c0 into main

* changes:
  Fix flakes due to tests resetting CarrierConfig
  Fix lint errors in NetworkAgentTest