Merge changes I25096f4c,I40ba22ab

* changes:
  cronet: enable defaults in aosp
  cronet: add defaults to enable / disable Cronet in framework-tethering