Merge "Remove base divergence" into main am: fd1eda2456

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

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