Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I6c7740ac21ed67d65493dd973649bbd7d12acb01
Change-Id: Icfde9096682a0899c6b09aebb044893b6b59aa11