Merge changes from topic "am-47354c9963cd472f8a0924974def0bc1" into android13-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [S-V2 CTS]" into android12L-tests-dev am: fee3f7bd51 -s ours
  [automerger skipped] DO NOT MERGE Track TZDB 2022a rev. 2 changes. [S-V2 CTS] am: a66db8df9c -s ours