Merge changes from topic "am-0cbeec0b01414aff9680e3ff72336add"

* changes:
  Merge changes from topic "am-960e3c7835da42969d560c97940929d4" into android12L-tests-dev am: 3b80e9f4ba -s ours
  [automerger skipped] Merge "DO NOT MERGE Make Android 12 CtsLibcoreTestCases pass with the new ART module" into android12-tests-dev am: cd9498e3fc -s ours am: d2f64cebe4 -s ours