Merge changes from topic "am-17ec6822f7b44adb879737c61517f97d"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Remove test cases in TestDateTimeFormatterBuilder." into android12L-tests-dev am: 44830a1cca -s ours
  [automerger skipped] DO NOT MERGE Remove test cases in TestDateTimeFormatterBuilder. am: 22331dfbce -s ours