refs/heads/android14-qpr3-d1-s3-release - platform/cts

commit: 051624162027808c3c123fdb1b7aaa865b6d4a40
[log]
author: Android Build Coastguard Worker <[email protected]>
Fri Jun 07 04:11:09 2024 +0000
committer: Android Build Coastguard Worker <[email protected]>
Fri Jun 07 04:11:09 2024 +0000
tree: b2be0f49f3c426d1e8190c8ba447cb2a5ddb9e18
parent: 28bd6daf81738da58328434d649abf2da241d157 [diff]
parent: 746cdfc00dc0937873fd53e15fca8ae0d2d2554e [diff]

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27676615', 'googleplex-android-review.googlesource.com/27696470'] into 24D1-release.

Change-Id: Ic287a3c968353abc1a8b19a70159c2826eb54b51

tree: b2be0f49f3c426d1e8190c8ba447cb2a5ddb9e18