Merge changes from topic "am-e77834e0fca14c5e8f661a2d4930d342" into main

* changes:
  [automerger skipped] Merge "Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future" into aosp-main-future am: 8597f0f8ab -s ours
  [automerger skipped] Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future am: 109d4d5b3f -s ours