tree 459b5682e5a184e5f6c9a36f55fe0e74a8c443d0
parent 54bf6673a9b749d6ad7718d1cee31091d6aad10f
parent 916abf696dcc715788e858f6d88468f4a177c93f
author TreeHugger Robot <treehugger-gerrit@google.com> 1607485572 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607485572 +0000

[automerger skipped] Merge "STS include missing apps from EphemeralTest" into oc-mr1-dev am: a05fcab23d am: 7a7b928296 -s ours am: 2d63a36489 -s ours am: 916abf696d -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4734422b8e8db189489ff948220a8a352036f9fa