refs/heads/android17-security-release - platform/cts

commit: c072a1f151ffc7b40e4ab187fd0a1af4025e8155
[log]
author: Android Build Coastguard Worker <[email protected]>
Thu Apr 16 15:26:17 2026 -0700
committer: Android Build Coastguard Worker <[email protected]>
Thu Apr 16 15:26:17 2026 -0700
tree: 2271f7cb0aaf5db0eddd49429e6b4762454b6cb2
parent: 55cc3d5826b0434c431bbac363937bcdc68b1721 [diff]
parent: 41fa40ed56c0c8e10691899beec8ca4b729e745e [diff]

Merge cherrypicks of ['googleplex-android-review.googlesource.com/39454247', 'googleplex-android-review.googlesource.com/39458701'] into 26Q2-release.

Change-Id: Ifb7f19c2dce25349d3212cf0c4c221d7afe02b25

tree: 2271f7cb0aaf5db0eddd49429e6b4762454b6cb2