refs/heads/android15-qpr2-s7-release - platform/cts

commit: 67075a77ff162c7f1f8b7e5a49080d3d5ff95dd7
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Fri Mar 21 22:50:27 2025 -0700
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Fri Mar 21 22:50:27 2025 -0700
tree: 5dfbf7f04a24b138d4d07e8e5a6d7bf2cecc49fb
parent: fb4f6dfebc9ddcd442544386885f7a3173fdda0d [diff]
parent: d0c0aba78c3176490dde6c6693a71e96f755b9f6 [diff]

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

Change-Id: I8bc635ae245e67f5913f1853e5cb590b8d59ab42

tree: 5dfbf7f04a24b138d4d07e8e5a6d7bf2cecc49fb