Merge changes from topic "am-3e82e00085224703a5bc1b9a2ac4788c" into main

* changes:
  [automerger skipped] Merge changes from topic "am-7a2ccf4a1ceb4ffb986cdbed5ae128f1" into main am: 33dc202b19 -s ours am: 5c0fac1378 -s ours
  [automerger skipped] Merge changes If05d11a0,Ie67f0141 into android15-tests-dev am: ef5149b0bd -s ours am: bf7d9ad0f9 -s ours am: 1dcfdd24c5 -s ours