refs/heads/android12L-platform-release - platform/cts

commit: 491b5fdf7a025957a67f86c125c9989a88371c6d
[log]
author: Android Build Coastguard Worker <[email protected]>
Fri Mar 08 08:46:40 2024 +0000
committer: Android Build Coastguard Worker <[email protected]>
Fri Mar 08 08:46:40 2024 +0000
tree: fa68b6c8e9cdd948032858312f5144b54e3d5105
parent: 5dedbf78f4975f27f11687544c4aca92b3c9c27f [diff]
parent: 1f7b874ee783e9cafeebac91201afb77bd14da34 [diff]

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24529771'] into sc-v2-platform-release.

Change-Id: If5e939bcccfbbad5201798729e857f4dace5ab02

tree: fa68b6c8e9cdd948032858312f5144b54e3d5105