dc7c7214a4fff70346aaf3154ac4260234a10969 - platform/cts

commit: dc7c7214a4fff70346aaf3154ac4260234a10969
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Wed Oct 22 07:00:48 2025 -0700
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Wed Oct 22 07:00:48 2025 -0700
tree: d7eacbb79418b6c634dd2c7cba6b9de4401e1515
parent: ec736e61970afad2fb374483104e3c703d9164a6 [diff]
parent: cd03117335129ad767dd85bedc50cd29e9ea4464 [diff]

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

Change-Id: I940c96a5cf5371b3c6e983cf629ce982c31b9535

tree: d7eacbb79418b6c634dd2c7cba6b9de4401e1515