[automerger skipped] Merge "cronet: remove cronet_java_defaults_enabled_srcs" am: fa482c992f -s ours am: a791b6017c -s ours

am skip reason: Merged-In I5750d87c9cab0e9d4d213b5a81a2d71cc9610a08 with SHA-1 1e3f7983fb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2400019

Change-Id: I84c8e33f20ef6e1fc66b793feb431457082b1552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>