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