Merge version 0~20210324.2-2+rpi1 and 0~20210324.2-3 to produce 0~20210324.2-3+rpi1

diff --cc absl/debugging/symbolize_test.cc
Simple merge

diff --cc debian/changelog
index 694f6254b2df8fa61f7a4766e16ee253dfc66707,296ed36f9b6644c58d474e58a988228d045b59f5..87ac4bbcd11cbb1edbbc24866763a9c488f09c45
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,18 @@@
- abseil (0~20210324.2-2+rpi1) bookworm-staging; urgency=medium
++abseil (0~20210324.2-3+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 0~20210324.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 25 Feb 2022 01:39:43 +0000]
 +  * Disable TestArmThumbOverlap, it fails to build with a "sorry unimplemented"
 +    error.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 25 Feb 2022 01:39:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 11 May 2022 02:15:18 +0000
++
+ abseil (0~20210324.2-3) unstable; urgency=medium
+ 
+   * Backport an upstream patch to disable a problematic unit test.
+     (Closes: #1007136)
+   * Reenable unit tests on hppa.
+ 
+  -- Benjamin Barenblat <bbaren@debian.org>  Thu, 14 Apr 2022 13:20:16 -0400
  
  abseil (0~20210324.2-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index d6173f6c7e96df7b696ef3b22abbf13bbeb9b332,f4bed7f4ecf007ecb1598e772144771960db9bc6..f957b2d35a16e38c606df416bebd5758f564aae2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -14,4 -13,6 +13,7 @@@ big-endian-random.dif
  big-endian-random2.diff
  big-endian-random3.diff
  big-endian-random4.diff
+ disable-nominalcpufrequency-test.diff
+ hppa-symbolize.diff
+ str-format-convert-test-printf.diff
 +disable-testarmthumboverlap.patch