Merge changes from topic "am-611eed0754b144ed92d14b3e518d54f2" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "String change to highlight calculation stopped at last even hour" into tm-qpr-dev am: 6aba166376 -s ours am: 18d5ebc38f -s ours am: 283bea4dd0 -s ours
  [automerger skipped] String change to highlight calculation stopped at last even hour am: 205d8249a7 -s ours am: 27c242f01d -s ours am: 92c94ed6e9 -s ours
This commit is contained in:
Automerger Merge Worker
2023-04-28 04:13:37 +00:00
committed by Android (Google) Code Review

Diff Content Not Available