Merge changes from topic "am-c0fd540477fb4dea83351368d8d0985c" into android12L-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Remove test cases in TestDateTimeFormatterBuilder." into android12-tests-dev am: aae110e9c4 -s ours
  [automerger skipped] DO NOT MERGE Remove test cases in TestDateTimeFormatterBuilder. am: dd13e3168a -s ours