Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ib4f55d635e8b0f9382a8aef961fc016efe050c30
Change-Id: I23af09074190c5abf44a577b103d4c11073a1d9e