Merge changes from topic "Bug335802563" into main

* changes:
  Revert "Android patch: CLDR data: Replace nb with no."
  Revert "Android patch: Patch addLikelySubtags("sh") tests"
  Regenerate ICU data after removing CLDR patches