[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 920c08720e -s ours am: 8fa918405f -s ours

am skip reason: Merged-In I858aedceffe03026158158acfed5b52fc5f28547 with SHA-1 fd84518fae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/16843592

Change-Id: I372ba4459c84a590bdb6310134fa3b895fcff17f