Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I65ed7d52733f0fb48e3e302ce21a9657a5639ec9
Change-Id: I469f5267e76edd38793f6265602b63f736858451