Merge changes from topic "am-1324cc5267bd42bf80b925722de582b5" into main

* changes:
  Merge "[RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior." into android14-tests-dev am: c2a27bd25a
  [RESTRICT AUTOMERGE] time_test#mktime_EOVERFLOW: allow both Android 14 and 2024Q1 behavior. am: 4c5eeb8346