985d8bf1055947a191ce5039f938dea8d3f698f6 - platform/cts

commit: 985d8bf1055947a191ce5039f938dea8d3f698f6
[log]
author: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mon Jan 27 13:21:51 2025 -0800
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mon Jan 27 13:21:51 2025 -0800
tree: 2efecb1700306754054456da0e5ceced1dcd6d41
parent: c6fbb490edb5b74844adf5bafc2c41b7379bf84f [diff]
parent: cacaa7d273b4d9bd19f3e2e08610dac90cbb0c6d [diff]

Merge changes from topic "am-b19b2447e8fe4d8e995e1a31245c6134" into main am: a42e47aa03 am: cacaa7d273

Original change: https://android-review.googlesource.com/c/platform/cts/+/3465196

Change-Id: I395e090119ddf974dbbd0e17515f256356007991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tree: 2efecb1700306754054456da0e5ceced1dcd6d41