Manually merge aosp/2760185 am: b12bdcc16f am: a5c15858a1 am: 08a9c8f5cc

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

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