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

Bug: 370570306
Merged-In: Id880c2a752e8b6cc5fb9337b4fe6e294d59687b1
Change-Id: I563eb2e6b10c98f9f60c9680e5f50ff0541ad7eb