tree be71e124012deaa08d80dc0a8ece5dd3cbcbe576
parent ffb90e915c37f988daeb83ed106ada338ba988ad
parent 334323abd5714ef7b52db06bfc60ace5d857323f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1730936331 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1730936331 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29710874'] into security-aosp-24Q3-release.

Change-Id: I67afbe1ece69fec67adc34f81b3d40f0b2d813fe