Merge changes from topic "am-b1b8281930f1453a9038894c75181e85"

* changes:
  Merge changes from topic "am-9433b25fa2fe417b8847f31746db8386" into android13-tests-dev am: 81f54e43ab
  [automerger skipped] Merge "RESTRICT AUTOMERGE: allow more time for the low-memory device" into android12-tests-dev am: 03268031a3 -s ours am: 39667ea67c -s ours am: 69be1a8693 -s ours