Merge changes from topic "am-034fc95ce8b84dba938bb10f892fdf17" into android13-tests-dev

* changes:
  Merge changes from topic "am-40e688780ec34a97b9691997681d16fc" into android12L-tests-dev am: 270ebc2535 -s ours
  [automerger skipped] Merge "Fix event parsing" into android12-tests-dev am: 70d02f260c -s ours am: 5429f9a482 -s ours