[automerger skipped] Merge "STS include missing apps from EphemeralTest" into oc-mr1-dev am: a05fcab23d am: 7a7b928296 -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: I6ccdb81539dbe5822f0f2930741be7183061b40c