Merge 24Q3 (ab/11976889) to aosp-main-future Bug: 347831320 Merged-In: I01ead3b525aae60d8b0ce7a04b721d4964543ee5 Change-Id: I5b08b2285077663829c36d702e9f4e21c4128601