Merge "Make grpc lib available for recovery" into main am: 3779c18baf

Original change: https://android-review.googlesource.com/c/platform/external/regex-re2/+/3425881

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