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