ICU-21578 Merging maint/maint-69 into main (conflict: icudata.jar)

diff --cc icu4c/source/common/filteredbrk.cpp
Simple merge

diff --cc icu4c/source/common/locid.cpp
Simple merge

diff --cc icu4c/source/test/testdata/rbbitst.txt
Simple merge

diff --cc icu4j/main/shared/data/icudata.jar
index fc600edfbfbd66e98f3255b4ff766167610ecc82,f41adfe943f35767821389486e98707ec8cf3006..31762473f6d75c223c1551c9754ec6af4c61713e
--- 1/icu4j/main/shared/data/icudata.jar
--- 2/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@@ -1,3 -1,3 +1,3 @@@
  version https://git-lfs.github.com/spec/v1
- oid sha256:8f668e5db6c9c9e8b2fcf5feaeb1bc16bb7b036466b0e045778ddd9dc00ad13a
- size 13383795
 -oid sha256:bf794066fd2548875de8a035fefe7998838d9559dd8ee9fb0246fa699faedf95
 -size 13302298
++oid sha256:8f02ab2967eaf73b6d28c8340d70b20d5f194f6c0ac24fe8464b25fd56763b04
++size 13383786

diff --cc icu4j/main/shared/data/icutzdata.jar
index 647ac0538fe982dea493acf93beefd290163a72a,c0c7a40415c7a614d97d3a9c68fdc34c111d930d..c0b07c2cf0079ff72b4527501d4d0dcca87bb202
--- 1/icu4j/main/shared/data/icutzdata.jar
--- 2/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@@ -1,3 -1,3 +1,3 @@@
  version https://git-lfs.github.com/spec/v1
- oid sha256:ecb74957c99d65a50729cd1d72e7e92e7254560381362980d73675d246281371
 -oid sha256:f856c514189522cc941cbb61f5f069057562ff91b2797c2715934a01ac01ce82
--size 95105
++oid sha256:da82185ad36c6b747848c409fff8661892c0ed5d5ebc0cdf8be9d29f4e3f65ef
++size 95096

diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/rbbi/rbbitst.txt
Simple merge