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

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

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