[automerger skipped] Merge "Introduce indirection layer on top Cronet ToT and...

[automerger skipped] Merge "Introduce indirection layer on top Cronet ToT and Stable import channels" into main am: 156491f4 -s ours am: f5fabb6f -s ours

am skip reason: Merged-In Icc3afb518264b463662b5a085e390bdfccff6e53 with SHA-1 78b8643a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3503473



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