Merge changes from topic "am-fe0171a76fb9483391f0e27f927c42ad"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Make Android 12 CtsLibcoreTestCases pass with the new ART module" into android12L-tests-dev am: 075f61f5f4 -s ours
  [automerger skipped] DO NOT MERGE Make Android 12 CtsLibcoreTestCases pass with the new ART module am: 93730ca0b0 -s ours