Manually merge aosp/2760185 am: b12bdcc16f

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

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