Manually merge aosp/2760185 am: fe041a0148

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

Change-Id: I50bc77f65a8419a69bfe5bfe835d57ec9cdd64fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>