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

* changes:
  [automerger skipped] Merge "[PM] Support update-ownership for Archived app" into android15-tests-dev am: ddc6553639 -s ours
  [automerger skipped] [PM] Support update-ownership for Archived app am: 72b969e7c1 -s ours