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