f240504c033c4db133c85ee344ad6f06f87cefc8 - platform/cts

commit: f240504c033c4db133c85ee344ad6f06f87cefc8
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Tue Sep 16 20:56:34 2025 -0700
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Tue Sep 16 20:56:34 2025 -0700
tree: 7a6e2ee01fbdedb1592e749c566131e31198b53e
parent: 3f1dc62e5e4dae08669417497365d2be477d7e09 [diff]
parent: d9273c1ec81a85a23094d3c33390227cadf79c88 [diff]

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35629799'] into 25Q4-release.

Change-Id: I25e4355535b176e2fe0cd44366104aa6e5bced22

tree: 7a6e2ee01fbdedb1592e749c566131e31198b53e