Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I8a46aae725a9e912681068df9c219e5a91784305
Change-Id: I9639177ef81917e51470e586aa4c3144fbb4f3be