Merge changes from topic "am-7a2ccf4a1ceb4ffb986cdbed5ae128f1" into main

* changes:
  [automerger skipped] Merge changes If05d11a0,Ie67f0141 into android15-tests-dev am: ef5149b0bd -s ours
  [automerger skipped] Polishing for migration to disable Weaver am: 7504b7b0fe -s ours