Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I9d2505965fdf343468a3eefe228d7e93b13f914b
Change-Id: Iaac661474b9dd684169eacbf5ec64f0bcfd78ec0