Manually merge aosp/2760185 am: b12bdcc16f am: a5c15858a1

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

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