Manually merge aosp/2760185 am: fdfcde22ab am: 356d4c916a

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

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