tree 9f08336570879ff323c5de2c0bd4e106dc491442
parent 7e18a83ced36e13e0c67bc49b0a439ecef0fd28c
parent 7cc362390256cf1d13a00f7df20bfb1a45dbd800
author TreeHugger Robot <treehugger-gerrit@google.com> 1607546376 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607546376 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS include missing apps from EphemeralTest" into oc-dev am: c5f5cb66f7 -s ours am: 7cc3623902 -s ours

am skip reason: Change-Id Ifac667a3667727815f3c0b789ed8816035266802 with SHA-1 7a2e8c869a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0a033da2b43da214f81a1fef9a301d0863ae9c1