tree 39e18c2f1bd1d9f7e4223ff4a304511ee7bcfad7
parent e6b2b72a9574c4b82ae74cedd1c4af10db9e5cad
parent a694e6fa56b2c73e14607912cb7335243f657291
author TreeHugger Robot <treehugger-gerrit@google.com> 1625768666 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625768666 +0000

Merge changes I095a869f,I587dfebb into sc-dev am: a694e6fa56

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

Change-Id: I5dab3f133c6683bc064cffad1c183fe6ef6c7590