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