refs/heads/android12-qpr1-release - platform/cts

commit: 05c10bf8b5a411b6c44c1e49956edf59ab1700a1
[log]
author: Android Build Coastguard Worker <[email protected]>
Wed Nov 24 23:26:06 2021 +0000
committer: Android Build Coastguard Worker <[email protected]>
Wed Nov 24 23:26:06 2021 +0000
tree: 16e5d3b9fc55cbb31911a5697415b3ce8c48292e
parent: c62ed0b859deab81a37bcf0a313bb7c77a249c82 [diff]
parent: a06b5c262dc86bd4d6086e2574850f396570e528 [diff]

Merge cherrypicks of [16212023] into sc-qpr1-release.

Change-Id: Ibd7de1369915695065dc4516331de47a9eee4aea

tree: 16e5d3b9fc55cbb31911a5697415b3ce8c48292e