Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I29c17ebeea5fe190221a490ed4388a33ca7bd950
Change-Id: I00b58c751b7d168578f01685c6555dbacba71b31