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