Add cherry-picked CLs to gen_desc_json am: 309109d37b

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

Change-Id: Ia150ab951bd4895c71f32c593d6f104aa224d205
Signed-off-by: Automerger Merge Worker <[email protected]>