Merge "Revert^2 "Remove base divergence"" into main am: 057d4f7549

Original change: https://android-review.googlesource.com/c/platform/external/cronet/+/2927730

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