Merge 24Q3 to AOSP main Bug: 357762254 Merged-In: Ie99b94a1ec75e9aa9af9e2720d911e5b750c5562 Change-Id: I3b952ad9aac8195526ccabb321bbf6586f936615