Merge "Revert "Remove base divergence"" into main am: 3c9aea4a91

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

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