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

commit: 26afd92da890af3a48fbe5e58bc141cc100ff25f
[log]
author: Android Build Coastguard Worker <[email protected]>
Wed Oct 11 22:54:01 2023 +0000
committer: Android Build Coastguard Worker <[email protected]>
Wed Oct 11 22:54:01 2023 +0000
tree: 1faafba00c37905a59e3f583e8916863ceab98bc
parent: 5c5a1cac99f23a61564c60be33f9274ff7fcd5fa [diff]
parent: 5a0e790f55bbdcf4f8f21200b33508d5637d60ac [diff]

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23917928'] into security-aosp-sc-v2-release.

Change-Id: I8dd3b82aaf5f1535dee3be6735f3c0bd262a85bb

tree: 1faafba00c37905a59e3f583e8916863ceab98bc