[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 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: I6558bbff4dd652ebf0007aaa765d28a9edfba756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>