Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I817efd443e49439e4134fca8bd3fd034bbbcc3cc
Change-Id: If3390cae730c27091053befe00bf28ca6fc86904