cronet: disable cronet defaults in tm-mainline-prod
Cronet is being released in U and therefore shouldn't become part of the
tethering apex until then.
The Merged-In line of this change references the change that originally
introduced it to prevent it from automerging anywhere.
Test: TH
Merged-In: I5a15acfed68f47b4d59fa72da3dbbce2fd00ae63
Change-Id: I2db8597adc8b4b340761fe4727fd7c74afaa4084
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index c3f4412..9ebf0c1 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -54,7 +54,7 @@
// enables or disables inclusion of Cronet in the Tethering apex. This is used to disable Cronet
// on tm-mainline-prod. Note: in order for Cronet APIs to work Cronet must also be enabled
// by the cronet_java_*_defaults in common/TetheringLib/Android.bp.
-cronet_in_tethering_apex_defaults = "CronetInTetheringApexDefaultsEnabled"
+cronet_in_tethering_apex_defaults = "CronetInTetheringApexDefaultsDisabled"
// This is a placeholder comment to avoid merge conflicts
// as cronet_apex_defaults may have different values
// depending on the branch