Manually merge aosp/2760185 am: 149928c641 am: 7fbedfb285

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

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