Merge "Upgrade to pcre2 version 10.31."
am: b66e00ca10

Change-Id: Idf25e2653f7c2ec11899384d4a7294bb51597439