Merge 24Q3 to AOSP main Bug: 357762254 Merged-In: I77c64e865f68f9fb86eac85e8798fc7ec8aa2d6d Change-Id: I2f47947c0e99f96b84b5fe924cfd02ed17737cf4