Merge changes from topic "am-3c550c0cc58642139fe9ac6add07b481"

* changes:
  Merge changes from topic "am-c0fd540477fb4dea83351368d8d0985c" into android12L-tests-dev am: 8f0417e5c9
  [automerger skipped] Merge "DO NOT MERGE Remove test cases in TestDateTimeFormatterBuilder." into android12-tests-dev am: aae110e9c4 -s ours am: f268b23c95 -s ours