Merge changes from topic "am-c21cfd67b7fc45299f9d53a6dcb7e7b4" into android11-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [Q CTS]" into android10-tests-dev am: 6d26628331 -s ours
  [automerger skipped] DO NOT MERGE Track TZDB 2022a rev. 2 changes. [Q CTS] am: 9647aae7e6 -s ours